Delete conflict markers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c076ffb14adec4b9d4bd7d852f487e96508ef868..25615d3c41fe5384bee1acbc6e38711169e76f8c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3606,12 +3606,8 @@
 
        * replace.el (match): Use yellow1 instead of yellow.
 
-<<<<<<< ChangeLog
        * progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of
        red.
-=======
-       * progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of red.
->>>>>>> 1.11807
 
        * pcvs-info.el (cvs-unknown): Likewise.